Use --file-name to detect syntax highlighting #892
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
(also tested manually) |
sharkdp
reviewed
Mar 27, 2020
sharkdp
force-pushed
the
891_filename_highlighter
branch
from
3cffcc5
to
ee09461
Compare
|
Rebased and fixed merge conflicts. |
sharkdp
reviewed
Apr 11, 2020
src/assets.rs
Outdated
Comment on lines
213
to
226
| (None, InputFile::StdIn(Some(file_name))) => self | ||
| .syntax_set | ||
| .find_syntax_by_extension(file_name.to_str().unwrap()) | ||
| .or_else(|| { | ||
| self.syntax_set.find_syntax_by_extension( | ||
| Path::new(file_name) | ||
| .extension() | ||
| .and_then(|x| x.to_str()) | ||
| .unwrap_or(""), | ||
| ) | ||
| }) | ||
| .or(String::from_utf8(reader.first_line.clone()) | ||
| .ok() | ||
| .and_then(|l| self.syntax_set.find_syntax_by_first_line(&l))), |
There was a problem hiding this comment.
I don't like the fact that the whole logic from the (None, InputFile::Ordinary(ofile)) case above is repeated here. We should extract this into a separate method or try to move both cases into the same match arm.
There was a problem hiding this comment.
Yep, that makes sense. I chose the helper method approach.
sharkdp
reviewed
Apr 11, 2020
sharkdp
reviewed
Apr 11, 2020
sharkdp
force-pushed
the
891_filename_highlighter
branch
from
1e59b36
to
09aef24
Compare
sharkdp
reviewed
Apr 21, 2020
|
Thank you for the updates! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #891